Add xstrrstr for searching strings from back. Make geo use it.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 32a9935ac3aedacc3fa091ef6c8f4873fc48d5f1..2dced8f30998a6e9b1adef5e0b2f2dd91097339b 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -593,6 +593,7 @@ int case_ignore_strncmp(const char *s1, const char *s2, int n);
 
 char *strsub(const char *s, const char *search, const char *replace);
 char *gstrsub(const char *s, const char *search, const char *replace);
+char *xstrrstr(const char *s1, const char *s2);
 void rtrim(char *s);
 signed int get_tz_offset(void);
 time_t mkgmtime(struct tm *t);

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index 4ce36d04e75d03503c7cb0e9822be58dfe0d224a..c1f4fc96aee363283b82c3b3671dfc8869889fb2 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -95,7 +95,7 @@ void wpt_name(const char *args, const char **unused)
 
        wpt_tmp->description = xstrappend(wpt_tmp->description,args);
        if (nuke_placer) {
-               char *s = strstr(wpt_tmp->description, " by ");
+               char *s = xstrrstr(wpt_tmp->description, " by ");
                if (s) {
                        *s = '\0';
                }

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 03bffb33101b6be232a7e530cea3c0b55733ab5b..ad4edf43998056958ab40f04d7e4be98032d74cf 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -727,6 +727,22 @@ gstrsub(const char *s, const char *search, const char *replace)
        return o;
 }
 
+/*
+ * Like strstr, but starts from back of string.
+ */
+char *
+xstrrstr(const char *s1, const char *s2) 
+{
+       char *r = NULL, *next = NULL; 
+
+       while (next = strstr(s1, s2)) {
+               r = next;
+               s1 = next + 1;
+       }
+       return r;
+}
+
+
 char *
 rot13( const char *s )
 {